diff -Naur qzdoom-q2.1.0/game-music-emu/CMakeLists.txt qzdoom-q2.1.0.patched/game-music-emu/CMakeLists.txt
--- qzdoom-q2.1.0/game-music-emu/CMakeLists.txt	2018-06-07 07:27:25.000000000 -0400
+++ qzdoom-q2.1.0.patched/game-music-emu/CMakeLists.txt	2021-11-09 13:58:55.345649214 -0500
@@ -89,7 +89,7 @@
    if (__LIBGME_TEST_VISIBILITY)
       # get the gcc version
       exec_program(${CMAKE_CXX_COMPILER} ARGS --version OUTPUT_VARIABLE _gcc_version_info)
-      string (REGEX MATCH "[3-9]\\.[0-9]\\.[0-9]" _gcc_version "${_gcc_version_info}")
+      string (REGEX MATCH "[1-9][0-9]*\\.[0-9]\\.[0-9]" _gcc_version "${_gcc_version_info}")
 
       # gcc <4.1 had poor support for symbol visibility
       if ((${_gcc_version} VERSION_GREATER "4.1") OR (${_gcc_version} VERSION_EQUAL "4.1"))
diff -Naur qzdoom-q2.1.0/src/scripting/types.cpp qzdoom-q2.1.0.patched/src/scripting/types.cpp
--- qzdoom-q2.1.0/src/scripting/types.cpp	2018-06-07 07:27:25.000000000 -0400
+++ qzdoom-q2.1.0.patched/src/scripting/types.cpp	2021-11-09 14:13:57.493590140 -0500
@@ -33,6 +33,7 @@
 **
 */
 
+#include <limits>
 #include "vmintern.h"
 #include "s_sound.h"
 #include "dthinker.h"
diff -Naur qzdoom-q2.1.0/src/sound/oplsynth/OPL3.cpp qzdoom-q2.1.0.patched/src/sound/oplsynth/OPL3.cpp
--- qzdoom-q2.1.0/src/sound/oplsynth/OPL3.cpp	2018-06-07 07:27:25.000000000 -0400
+++ qzdoom-q2.1.0.patched/src/sound/oplsynth/OPL3.cpp	2021-11-09 14:15:14.021585129 -0500
@@ -43,6 +43,7 @@
  * 
  */
 
+#include <limits>
 #include <math.h>
 
 #include "doomtype.h"
